First step to meet customer requirements for #46