fixed broken shit, redux