Reordered observation functions and fixed Eclipse.