Not sure whether it is all right about this change (the dynamic var). Please let me know if there is problem.