updated with Sven's work from March