Applied Manuel's suggestions