Updated to work with the new layout