Fix the OWPS calculations, maybe