updated with changes for apps