2 Commits (trent-tweaks)