fixing refactor
fixed
bug fixes