These two are probably not needed?