couple of undefined errors
merge conflicts