Added SWPP and made several changes to other systems