Fixing it so it actually works