updated for shifts