Fixed timeout and export things
Merge