merged recent changes