prototyping improvements