Updated Code Layout