Bug Fix  + Refactoring + Command #:: R added