configure refactoring, shuffle feature intoduced