Refactor to use 'subject'