Minor Fixes
Removed old draft added a new one