updated DEMO & template projects