updates from first integrated test