Updated usage or methods, thingd are a bit cleaner
Added untested examples