Revamping implementation