MODIFIED: removed commented out code