NEW: adding stuff for base app