Made template better!