added support to create the destination and fixed visual bug