Personilized module
Removed stuff that have been moved to the module
Make use of the more modules