made changes to working and to reflect the removal of the 'content' option