Consolidate step2

ref issue #17