Made sandbox better