Cleaned up PINS