reworked lot of things