Update

Some slight modifications