Refactored new code to prevent unnecessary head aches