Would be great if we can make this work for both new and existing