refactoring logic for faster performance
Merge branch 'develop' of github.com:TheConstructors/QwikStubs into realtime