made 2.5 work properly