going to merge discussion and current