merged in changes