Updated skeleton program flow and logic