Refactor to express 4.0 cock