new design fixes;