Merged source code with latest design