This process is much easier and cleaner now