Refactored

Should works!