Further modifications