reworking and fixing