final commit; little tuning