Also maybe refactor this in a separate method for readability