Updated version with no drag and drop questions