Small update. Reworking some code.