Added proper code

*Still does not work*