Varun/thomas redesign