530 client refactoring project