added r--remove && update output