FUL-165 - add modification for Flamingo implementation