several changes after push to testing server