Matan's further changes