Added control flow