added some constants, removed comment