update after final testing