Fixed Abdi's errors