merged with my design