converted closure and dict, only class left