Reworked the first commit to keep the methods and just add a note.