Updated to work with new version