updated just a bit