Some further modifications