Still fixing accuracy calc