now working as expected after wonky merge