partial rewrite
working business part
implementation with added/removed entries