updated sources and code