Continued on work logic