refact
bump take1
nopt silent
fixx
bump func