Working on editing subjects