updated to version 2