Changed the template a little again to correct som errors.