Tried some new fixes