updated to work with version 3.2