trying to do more fixes