not commited images and some modifications