improved fun templates