Updated subs conversion and fixed bug