code changes after bootstrap integration