User activity completed, lots more optimization