updated number, some enhancenemnts