removed unnecessary code, just need hints and diag check