Add working better