Responsive and guard added