Updated for scoot