Update
Make external subs working