fixed new logic
Fixed stuff