V3.0 Removing breaks from code