Changes to add all into single logic