some progress
all version 2
house keeping