Added more heavy load + minor change