Fixed magic numbers
Improved monitor cell interface