Added some constants and a sanity check