Client elaboration (a bit) <3