merged with 0.5