fix to hw and review