some updates but not the final version