Recreated all features to reflect latest changes