Added more code for prototype