added xscape mapping