merged with Luis branch