Rewrote PropertyEvent