Quick update of spaghetti code.