Added: More controller logic.