velocity implementation working, code refactored and economized