Changed a few design features