Removed extra client variable stuff, added flag info