still working on bugs with internal calls