few changes
changes finished