Futureproofed this method a bit I think