Updated with new html structure