some changes.. long time ago.. dunno what :/