still fixing samples for 5.0