final chagnes to version 1