Update

Add last features (not tested)