brought in changes for Nighat (up to March 11, 2013)