update define function
rebuild, using new define wrapper
rebuild, using new define wrapper