merging
added gino's content