loosening version and inline missing code from next version up