Fixed concurr error and added more functionality