some changes
final commit