Incorporated 3.0 updates from Mohamed Zergaoui