Updates to the codes to make them more user friendly