Commenting out code from previous commit (not working properly so far).