Update

More comments will be added later.....