adding responsiveness

and merge with master