fix + testing..