cleaned up and rdy to go