Adapted suggests for 2.3