made updates from andres comments