Refactored I guess?