updating from rosarios branch