Updated Project; Clean breakpoint
More efficient