Add sorting afterwards