small updatings to make it all work