creation optimized
more improvements, almost all