Reworked PR to avoid repeating the command