MAJOR IMPROVEMENTS LOL