Added some new classes and trying out hardware fix