added in bugged classes