Refine behavior : almost final version