Merge with Tibor's code added files