Edited dates probelm and metabolism
Merge branch 'sstoyanovs2'