some changes ... :P