bugs remove; only one file to call