Response mechanic and minor changes