Incoporated suggestions