heavy modification to make everything much better