merging decay add
adding decay
including simons stuff