streamlined logic. needs to adjust values sent to client