Added constants and reversed parsing order (correct OOO)