added fixes !