Fully switched over to using the work method