Intermediate Refactoring BUGS.h