Made changes that Ryan asked for