Cleaned up base