fixed and clean up, still not working
fixed and clean up, still not working