incremental improvements. weigh(broken), MUST fix..