Refined subject behavior, removed Event