Removed changes from pent fix, not ready yet