done 1st version
updated some stuff