Modifications to match new design
Modifications to match new design