responsiveness

merging step 1