1. -Fix export bug.
1. -Move method.