added else. bout all