updates from first integration