uncommented the code from before, so back to before