Refactoring to make it easier to deal with
Changed declaration slightly