Change 30 and 41