Unify

Unify by ryan48368.