Web and Core implemented
Fixes