Logic changes
Logic changes