Added updated files from Asker