some changes ... <- very describing :)