Incoporate suggestions