made some updates but still in progress