performance bugs
merge