Looks better now