back to broken code + add sample code for Fedor