beggining re-write
changed
Rewrite of modules
Re-write