Modifications and additions