Adding chris' structure