Revamped Client