cut down not needed buts and boxes, working on logic and timings.