Improved it a little bit