2nd draft but it's working commit