improved compatibility a lot!