Updated to use elroy.observe