Reworking some fundamental functions