updates and maybe fix issue