calling method added, cleaned up a bit