Made changes that were supposed to be in last commit