updated to schema ver 2
