updated references
adding observer custom events and removed forced return false condition loop
merged