improvements
improvements
avoiding use of external libs (for now)