changed the interface around to make it look nicer