added last commits from LC2