Some quick and bad changes