Revamping implementation (II)