shift functionality around for future entrypoint compatibility