current work from storck house
attempt to removed conflicts