Reviewed the whole process and made modifications