A few changes, simpler is better