remake to base template