small changes not finished