Added logic to interface