merged in changes manually