structural changes, few things here n there