updated to ver. 2.1