Cleaned up and squared base