refactored. better but not perfect design
adapted to use new numberserver design
refactoring & gc