Design updates, some logic