Made some improvements to versatility