taking care of @josenavas comments