Incorporated changes from bus project.