refactor
fixes for subject object