took out still_relevant and cleaned up logic to reflect changes