small design modifications