issue #3, implemented and improved various calls