Updated with the newest layout