do the same as last time but it actually works now