fixing other entry points