update to match Marius' version