this should be changed to the changed definition in the header, right?