Made small design change