Updates for Version 3