2 updates

See previous commit