Updated for bike addition