This should no longer be needed. Will remove it