- loading issue on the client
- prepare call functionality turned into promise model