Updated code from previous Rush Hour build