removed unnecessay endless