Re-integrate own code after review

Re-integrate own code after review