some progress
merging changes