Made changes that were supposed to be commited earlier.