Added the code that was writen on Friday