Some Changes to the Functions