DO NOT MERGE - added samples