B1.1 : Small changes and fixes
B1.2 : Rewritten and checked