Added some possibly-unnecessary stuff