Rewrote some command buffer usage