Readded some boxes, changes in RcModel