Major update with design rework