minor changes(work in progress)