updates from neurana
resolved conflicts