New code is all working