Added new functions and samples (isn't working)