Reworking some code.