minor changes
minor changes to connect with coloring
refactoring
refactoring
refactoring