fixed up shit