Reorder methods, implement Enhancement 24 [1074]