Adding Server and Client patches, not fully tested