Changed around several things