Added observer to ensure a better feedback (unfinished...)