completed version 1.1