Add POST2. Refactor code