Extended vanila

Just like in the regular version, but slightly more convenient