Still does not work right