Improved things a little bit