updated for version 1.2