include Luis' suggestions