Updated to the new Observation object