not sure if it's fully working, but better