Changes for Version 3.20