*bug fix
*refactoring