added old changes from BigMax