Modularized and added a working cone shape