fix accessiblility
check redundancies