Rebuild all logic