modifications to get correct version