Small change per calzone's request