VIJAY: generic changes