Changed template-handling and temporary hardcoded a template