get back

Some changes discarded and add comments