Further Nakul's changes