prepare for V2 - material design