no composer; updated functions; no composer