its working

still needs to be checked and upgrated