Amit - changing some spaces