Comment limit
Get rid of scaling and X_shape