Fix small bug and start to integrate blossom 5