added breaks
updating..
merge fix