Continue Boilerplate-11/06