working state, still more cleaning required