changed format to line up with gcamp, added containers