refactoring to add more picketlink