Changes to subrutine