Add full function of on the fly, left a bug #time 4h