buggy version W=429498361
several changes and bug pending