updated for new versioning, etc