deleted more functions