put back the important part that was temporarily commented out