Changed exit to just return