improved orbs

needs code refactoring/change of approach