Added logic