even more random changes