fixing stuff nick overwrote by accident
merge conflict