change start to 1830 and clean up