changed to version 2