I made some changes to your last commit if you have time take a look 7dcdc6f93f03c5b0eeee5d5d7fd73e034aa69d0d