Changes made for decomposition