Moved box to proto
Merge