keep up with trunk development of Classic