Updated code to see if this looks better