some first changes...