added RN and made tweaks to be more modular