Update

All questions but #5