fixed include issue; still buggy