rename and modernize
put things in working order