Switched to compatibility.h file