Sync with master, added shift method, updated mappings