Desing improvements