updated to work with watchr 2.4.x