Fix mistakes of previous commits + timestamp = long + huge story binding change