updated to match format #1 branch