fixing and enhanching.