comitt april 3 with bugs not tested yet