Cleaned up code a bit more
Merge remote-tracking branch 'origin/make_fragment' into make_fragment