Changes the Self Join Query to be more practical