Updated to the latest templates