Shortened and combined 8/2/17