Version 2.2 -- added with to code