reorganized bootstrap