Improve self-executing function..