Sorted methods in to correct classes