Attempted Fixes