Get rid of flush and make everythign better

It works!