Update my fork

Updating from original code