some lame changes