I like this change, more flexible and easy to understand, simple logic will make this easy to maintain.