This is how it should have been