merged minor changes