Re-write for all types of boxes