renamed
refactoring
fix some glitches