Adding another sample implementation and some random updates