Fixed Guillermos comments