UPDATED code layout.