changeitupntry - Cleaned up