fixing entrypoints