Changed a few things here and there