Update

Merge some updates