pulling updates from ivan mendoza