attempting to fix guards
merge