Finally fixed features