starting to fix/improve the monitor