Revamped program structure