server refactor amount