Updated source template and scoring calc