#52, minor editings for the code to work correctly