Attempt to fig it up a bit