UPDATE #16

Cleaned up things, now working under control elements centralization.