Restored the constants into the function