update 2 after merging