fixed more code