Cleaned up 4.2