updated asset handling