Massive Improvements. (ver. 2)