Commented out blocked logic for now