Rewritten and added edit sections