Added inplementtion for tiny and control atoms