Updated for new res layout