Revamping code, removing need for special head category