Fixed functionality for work