@quigproquo @kaiprt Pre rollback

Fixing Comments and Queue to stop from repeating