DO NOT MERGE - TESTING - Sp advanced settings