Still not working but better