Changed random command
prepared for tpa implementation