Revamping entire system