Updated proper code