Removed storage of initiator and replaced with a boolean