reworked the whole thing