Reverted a few changes, renamed box