Better responsive and type