Rebuilt for more flexibility