Now we use the proper method to avoid code dups