Update for Legacy support

Initially for GS4 just to see if it works