Some light modifications