Product improvements

shape