Idk if this is an improvement or not