Adding changes from Ricky Castillo