Removed client variable stuff, added flag info