edit #24, 25, 26, 27, 28