Working version: a few problems at end of prototyping 4 day