added old changes that failed due to stupid merge