fixing some BS3 stuff