Fixed merge errors and changed to Loozebutton