modified sample to new format
we might have problems now
Fixed errors