Added Guard clauses