first changes to overall design