Version 2.1 (updated comments)