W Logic update, fixed some issues.