refactoring
add bootstrap hack comment