still not working but is better