Looks better
First cut