fixes unresolved symbols
merged extens