made modulr rontgen
refactor