Switched some constants for generic