Update Code based on comments