replacements ready @samirovich @cinai