Added NoorUllah's 2nd form, fixed an insert bug