#24 integrate into put