Updated Logic

Changes bitch