removed return false;