added things that i'm sure will break this