fixed stuff with chris