Reconfigured some things