updated to work with new layout