updates based on prototype v2 testing.