Finished component-bound logic changes