added some breaks to fix bug (temp)