Revamped template