v2.2. Skin functionality added, code cleanup