changed payload version, refactoring