updates
merge fuckup