…e pattern to one that shouldn't break in the future -Refactoring shitz