i' ve done some testing modifications