remove define,and added runtime