merge for refocus class fixes