updated to fit the first release version