Revamping old code and interface