Can you remove this and work with me to merge both PR together?