[#42] Simplification of retake request