Modularized and recreated the features.