Fixing the code for the constants and data.