More compatibility added... fixed old