Discussion had. Need to add other new functions