merging
Class list bug fix