small cleanup to make it work in basic mode - now need to take arguments