Commited for fixes
Changes on B