final commit beta 17/03