updated asset ref logic, TODO and TAGS