Pulling Bo's additions