start a support for monitors and slightly better code