Added changes to be used independently.