some updates
trying to merge