Updated with luis branch