added some useful modules from extra + my modified privdeaf