fixed updates
merge