v.0.2.1 - minimize code... [in process...]