working on clean up and new monitor