turned to if-let