Incorporated changes from carbon template