reworked errors