improved things a lot