added some funny changes