Change Some Logic