added fragment support