Get rid of bugs but only U2 works so far