Updated to reduce server load