Added more prototyping