More updataes and responsivnes