fine tune the wrapper scripts