reworked some things