WE:20140317:Fixes added post the "training"