Yeah, this looks better