Added in Christina changes