major work has been done after first commit