Small design modifications