Bringing in hisakos changes