Continued working on the code

! Not working currently !