Modify existing to suite new model & working