fized up more code