added bong's changes