Added some stuff [to-be-documented]