Added some monitor magic