More attempts to make it pretty