start of changes from template to adrian