changing random yay
manual merge of random