serious simplification / convert to net45