New version with improved features