critical fixes mark 2