Added some additional work