reslove changes for capslide after merging from alexycheung