branched off AlexModifications
Refactored to make mapping work with catalina setup on CS servers