tobias changes merged