Trying to make things fit nicer