Add xs in front
Merged both versions