Changed design
Fix conflict