Added a bit more in prototyping