Addressed matpap's comments