Starting to add an end condition