cleaned up api switching