chris possibly final commit