Comment change and removed unnecessary ability