changes from app template incorporated