updated to new api: NO DAO