Added plusmaster's masters + optimizations