Feature/design upgrade

Second attempt at providing this patch.