Modified Client