Updates to @First and Master Graphics