Adding chris's changes