Working on both Simba/SRL versions