Refactored to remove dumb ideas