Added phillipp's commits