Added changes from original project