Reverted back to nonworking version with comments