Updated toybox after a lot of trouble