Added logic calls