reworking 004 and 005