Logic change
Doc update