further changes to work towards new design